* (bug 3480) MediaWiki:Historywarning now has a parameter that contains the number...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 4aba3ce..f1bf3f7 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -259,6 +259,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   an own 'mw-error-cannotdelete' class
 * New hook AbortNewAccountAuto, called before account creation from AuthPlugin-
   or ExtUser-driven requests.
+* (bug 3480) The warning saying that the page has a history when deleting it now
+  contains the number of revisions in the history
 
 === Bug fixes in 1.16 ===
 

diff --git a/includes/Article.php b/includes/Article.php
index 7664808..f9a04cc 100644 (file)
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -2599,7 +2599,8 @@ class Article {
                // If the page has a history, insert a warning
                if( $hasHistory && !$confirm ) {
                        $skin = $wgUser->getSkin();
-                       $wgOut->addHTML( '<strong>' . wfMsgExt( 'historywarning', array( 'parseinline' ) ) . ' ' . $skin->historyLink() . '</strong>' );
+                       $revisions = $this->estimateRevisionCount();
+                       $wgOut->addHTML( '<strong>' . wfMsgExt( 'historywarning', array( 'parseinline' ), $revisions ) . ' ' . $skin->historyLink() . '</strong>' );
                        if( $bigHistory ) {
                                global $wgLang, $wgDeleteRevisionsLimit;
                                $wgOut->wrapWikiMsg( "<div class='error'>\n$1</div>\n",

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 4e9f67f..ac8220b 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -2676,7 +2676,7 @@ Feedback and further assistance:
 'delete-confirm'         => 'Delete "$1"',
 'delete-backlink'        => '← $1', # only translate this message to other languages if you have to change it
 'delete-legend'          => 'Delete',
-'historywarning'         => "'''Warning:''' The page you are about to delete has a history:",
+'historywarning'         => "'''Warning:''' The page you are about to delete has a history with $1 {{PLURAL:$1|revision|revisions}}:",
 'confirmdeletetext'      => 'You are about to delete a page along with all of its history.
 Please confirm that you intend to do this, that you understand the consequences, and that you are doing this in accordance with [[{{MediaWiki:Policy-url}}|the policy]].',
 'actioncomplete'         => 'Action complete',